Refactored to use package