Add annotate gem
update migration
More changes