Updated several classes