added more def-classes