Add generic geometry class