Additions to maintenance mode