Added new services and improved error handling