Enhancements on contact module.