Add last missing pieces