Update formfields to new SS stuff