simplified structure and extended affected classes