Tiny + ICE Plugin + structure changes