Changed function names for parsing from function from filepath or string