First step of extensibility