Actually I hadn't tested that part. and you are completely right, it will break the data model. I'll revert this change.