Handle configuration better