Mapping the 0.3.2 version of the SDK
Fixing and cleanup
Fixing API usage