Added support for more a.a. models