Add replenishment mode & replace deprecated method