ENH: support for non-standard entry types