Added more calls to component initialization