Adding in the beginning of the customer and state entities