Turn into an extension