added list class, update other classes