Using annotations and improved the GenerateDOTMojo