Update 1.5.6
- Refactoring