Updated model and inspector.