v1.4.1 Refactoring