Added more commands. Seperate query from creation.