Add some support for undocumented params