Added omssa modifications improvements