Refactored Data Holder into generalized look up