Improvements that allow for CLI access.