Change parameter singleton objects to vals