Added initial support for autocomplete derivation steps