Added default values and fixed config