Added file reader and some updates