[AESH-104]
renamed Command to CommandDefinition, need the Command for later :)