Fixed issues with outdated routing, timestamp creation