Updated the system for long-term post-Cloudspace run.