Adding new files and editing primitives objects construction