Added Node container and modified edges a bit