Make solver optional