Added cascade delete support