Further service enhancements