Edit on some class structures