can we not let the compiler pass for the metadata add the enhancers as needed?