Refactored to Core package
Post refactor changes