Added types to Block classes, Communal classes gets and put back blocks.