Implemented retrieval of geometry data and creation of geometry filter, added new tests and renamed classes and methods