Improved services and logging