move definitions to configuration