Add logging & service list management