Get rid of paramDict and simplify things a bit