Feature/merged class overview