Added parsing file and other updates

Added parsing file and other updates.