SDK2 Migration