More instance support - #3