Bringed the SDK macros back