Add documentation and test for new options