Refactor: Added extensibility points.