Missing classes added (hopefully)