added reference fields
name collision fixes