Production v1.0.1 after Refactoring