Instead, bring back building all the objects into calendar itself, and only use the private library internally.