Added join table inheritance support