Added the option to have references between models