Improved ContactService