Some support for Amos models added.