added header stamps and key-value options