Added support for contact info variables