Add more options
Update documentation and changelog