Better lookups for API

Close #1