Added JSON Local API
Merged changes