Added more stuff to state parametrization and augmentation