updated service with performance enhancements