Added timestamp concern. Closes #16