Added DEFAULT_SUBDEVICE and fixed number being created