Remove instanceof check (does not work across modules)