JAM-6 Updated dao and services