Port more models and classes