Added entry and attribute managers