referencesOne and embedsOne improvements