Improve SAGE config