Polish API after merging *Manager into Config