added support v7 lib