Moving configuration into Util class