Added user trait and changed migrations