Added easier configuration