Core extensibility

Core extensibility