Add basic common classes