Added more options

Added more options