Changes to support AnsiString
Removed ambiguity
Added missing files