Included extra column & made lookups dynamic