#169 SDK Decoupling