Add new classes I forgot in the previous commit