Updated to latest store implementations