Started adding configuration processing