refactored Command and Feature classes