Added in more options