Changed to a more generic configuration