Fix: Scan's functions are now actually returning something
Added router