Fixed structure
Added support for zero prefix to dates