Added shapes to nodes