Hotfix - Separate class definition, so its autoloadable.