Complete revamp for SDK 2.0