Add classes for overwriting original classes as workaround for fixing bugs in original classes