Improve Contact handling