A system and method are described for performing a mapping between persistent data objects and a database. For example, a method according to one embodiment of the invention comprises determining whether an attribute having a generic type is an instance of a persistent class; and if the attribute is an instance of a persistent class, then mapping the attribute to a discriminator column holding the type associated with the attribute and further mapping the attribute to a reference column holding a key associated with the attribute.