many changes. now can use translator class for all queries