Fix timestamp; split schemes