Updates and minor refactoring