Refactor package property