Fixed Extra class