Updated declarations for the new markup