change dao calls to hql instead of stored procedures