added optional feature store