Better support for IDs (see #17)