added generic parser with dates