Refactor command glue into Command class