Changed faces to a dictionary
Removed default params for primitive comps