Adding support for runtime facet support