Refactor and add some commands