Refactor core namespace
Add literal validations