Follow kosmtik refactor