Fixed date converter and added support for multiple data frames