Added DaoCriteria features