Add support for new path option