Removed PMF and moved logic to Generic Dao.