Use simple storage for ids. Closes #9