Working on flexstore