removed custom JSON and use attributes instead