Added extensibility point