Updated maintenance scripts