Add rudimentary format support