Better configuration, and implementation switching