Add the missing pieces