Changed some names and and constructor for config