o improve configuration handling