Fixed cascade save and delete