Add a bunch more options not previously there