Optimized class declaration and made lists uniform