More options added and documented