Updated functions for dealing with non-INI documents