Add maintenance functionality