Add internal status mapping fields