deviceHandler methods moved to a new helper class