#3 #4 #5 Add configuration