Add spec contents from Arofan and others