Removed entry requires.
A few additional checks.
cli_spec and conf_spec.