Added design improvements.