Use direct properties instead
Use new support accounts; text tweaks