Really support non integer IDs
Version 0.3.6