Added in more attributes