Add index which improves image indexing performance drastically.
Unify command line parameter creation.