Changed the core data structure