only use maps with small arguments
Merge branch 'multithreading' into dev