Changed int properties  into NSInteger