Add missing classes to build