Changed to feature service

Changed to feature service