Frontend State and Store Enhancement