More generation changes...