Refactored position package.