Merge "Moving parser functions to a sourced file"