SDK fine tuning and smaller changes dependend on API discussions;
Uri encoding;