Updated the generic es feature using the store feature