Added generic classes