Infrastructure improvements

This update includes general infrastructure updates.