Changes to_json to add associations