Add support for create and destroy