Added join table type and overrides for embedded models