Commands - Fixed getters and setter for targetType