v2.1 - Added parsing file