Update to cratfty v.0.5.3
New achitecture
Refactoring with the new architecture