Fixed to allow data proeprty to be an object in CustomData extension