Added date and file support