Fixed setStore functionality. Removed TODO