Update to support zero padding