Version 2 added with struct features