Updated EntryManager and AccountManager

Updated EntryManager and AccountManager to reflect design-changes.