Added CompanyMapping for tasks #11 and #12