Changed extensibility to extension model