Minor refactoring
Major Prism update