Added geometry boilerplate code