Added a few missing class entries