Reworked services and routes