Added rest of geometry types. Closes #413.