Added Location and Company with a prePersit listener

Modified Company with a listener