Implemented a new Definition object to allow for faster resolution through runtime configuration