Improve service record functionality