Added optional config inclusion