Add support for version 4