Enhance steps definitions to use values from logic.