Added Database query and look up class