Added ability to lookup in front end