Additional components missed in previous commit