Added classes missing from last commit