-Refactored away dependency on ICustomAttributeProvider