Started moving node configuration into objects