[BUGFIX] Create class directly to avoid double inclusion