More tested options, more filters, code refactoring, and improvements on the mapping.