Restructured again and got instances working properly