Added parameter handler back in.