#1210: Improve UIKit class