Updated many of classes based on DnD