Add named parameters and fix parsing