Updated to latests flexstore specs