commit sdz4 with generic classes