Updates for Prism 2.0+