-fix for analytics
-added deferrable to device class mapping