Further alterations necessary due to namespace change/signature alteration.