removed magic number fom DAO classes