Adding some basic mapping for filtering