Manager and core changes