More generation improvements