Updated classes due to renames.
Added comments.
Replaced hardcoded local reference with nuget package.