Small modifications
Add additional json options