Core should be singular
Refactor