Can we get rid of this `enhanced_` prefix too? I don't feel it makes it more descriptive.