Add json interpretation
Refactoring
Naming