Merged with latest config