Added macro shrtcuts for determining device type