Added some commands and getters/setters