Rafael Winterhalter What can I and/or Luis Barreiro help with at this point? If you want you can take a crack at designing this Class/Field/Attribute API and retrofitting EnhancementContext; or Luis Barreiro or I can.