code enhancements for services common