Refactoring backend data package