Added machines and entities for installer/uninstaller