Minor changes and some preparations to make full-blown file parser