Added Company / Contacts and some templating