Added further attributes to optimize for.