Change DAO implementation to GeneralDAO implementation