Enhancements To The SAM-grid Infrastructure