Added NSRectFromCGRect and NSSizeFromCGSize