Added annotate and rspec
merged users
Added annotation for users