Added store policy checks calls (incomplete and not tested)