AndroMDA Template Enhancements