Add specs for classes and defines