Refactor command inclusion