Updated config to allow more custom usage