Json Composers + refactoring.