Add classes for parsing