Support raw format in the client
Rename attribute