Changed some properties to NSInteger