Added Manager, some minor changes