Refactor to use a light instance manager
Add missing files