Changed AddInternalTraits constructor to be templeted on base type
Passes all tests