Jason refactoring