[WIP] Improved manager concept