Updated the markup to match the v4.0 markup.