Updated some properties to match ivars