Refactor command utility annotations