Refactor Descriptors
Refactor command not found process