Fixed entity generation classes.