Software update and refactoring [1.0.7]