Changed platform/context/device handling