Add current standard behavior