Now accepts config options