Add new attributes to user_extra table.

Also rename imports.