#677 Separate loading of definitions from instances