Changed to DataFile for handling BlockDates Data

> Also Modified Unit Test