Moved to 1.6
Added JSON helper methods and variables