Finish custom parser support