Updated for zetta update with zetta-device