Added company id to order and payment tables