Please review and merge added few lookups and fixed few bugs