Modified GillisKeyService, added GillisDefinitionsService