Fixed 'state' check to the latest redirect. Changed some properties to 'protected' to make it easier for derived classes