Added entry manager