Restructure parsing, parse dates