Implemented new parser with different filename expectations