Add Configuration options and thanks