Refactor data package