Fixes circular dep error and unfunctioning Store after configuration introduces