Added transparent support for associations