Whitespaces and StyleCop issues
Changed from extended attribute to Uuid property
Improved unit test