Cascade save issue fixed, dao improvements