fixed another deprecated issue
Removed v6 structure