Adds raw-type; adds val-param to build values