Several improvements to the SDK