Updates with better JSON format and some fixes