Improved API and storage (1 byte less)