Services overhaul