Added module/device mode