Added Consumer and ConsumerInstance entities, removed guid from Site