Sotera related changes and additions.