Add annotate gem and update models