Adding in latest config options and files