Added new structure for apps