Add string format support