Added commands, Better commands handling