Refactor and simplify dependencies
Add TIMESTAMP_LOG