Add parts missed in previous commit