Improve library with tagging. Closes #48