Updated to use a more spring like config