Update depedencies
Replace set method with add method

According to Changelog for version 3.6
Replace more occurrences of set method
Make surface_area an optional field