Improve preset handling for non-integers.
Add the ExtractFolder method