Replaced generic lookup object w/ custom object

Custom object can be wrapped around other APIs
For storage