First implementation of better file scanning api