First changes, classes added