Moved definitions to KB