Adding more getfeature functionality - still testing