Added macros for Device checks