Added basic command logic