Fix compiler warning
Support custom table entry formats