Added some more options and stubs