Refactore base core