Preserve timestamps when adding new entry
Handle server restart for cassandra component
minor changes