adding named query support