Removed rescan stub and added wrapper