integrating last missings part previously implemented in Spoon