Fix property mapping for opject creation
Fix cascade annotation for links