Added performance filter and Store support (TODO tests)