Add Annotate Gem and some more validations