Removed functions dependency from parser