dependency fix
refactored command structure