Added a few empty classes