Fixed Create and Delete Command