Merged
Added User Model