Updated JSON method to include all parameters from AS