Adding options back to #517