Add maintain setting working