Update for 'ID taken' issue. Closes #2.