Updates to work with some refactoring in preparation for beta release