Added geometry context interface