Added new structure with subviews