Better taxonomy of entries