Fixed 401, added contact data extraction