Made some properties private (not used external so don't expose them)