Additional Jobs. Entity class clean up.