Moved measurement modifications into attack class