Refactor manage out of saic (to help with azure)