Added a few more options