Rework services to use services manager