Added common generic classes