Add cylinder and polyhedron
Refactoring