Update Fork to Merge V2 Changes

Just merging changes from base repo