Updated conf; Added more flexible settings