POI class extended

feature type implemented
cleanup