Added support for Delphi 2007