Additional filtering. Extracted libraries to be ported and refactored.