Added new structure and comments