Wires: fixes from testing
Refactored container and building mechanism