Add support for disk tokens