Update to v3

Added CR
Changed include files