Follow kosmtik state refactor