Add other fields (no server support yet)