Improves parser a bit
Adds joda time