Improved how the create and destroy procs work