Add proper scope