Updated with specific config