Add support for handling contacts