Now saving parameters in dict
Moved operators to dicts