Removed state concept, just using stores