Added type annotations to all sources
Added option to avoid location trimming
Added option to use all locations