[Upg] Use self instead of static (scope)