Update for new more modular and updateable system