Added more initialization features.