Updated major components