Various updates to the library - not all models are complete