Optimize lookup

Should we allow this in the first place?