Removed COM dependency