fixed column name
added role to user
merge with last changes