Added Lookups and new Entities