Added regulator support