Added basic regular and filter expression matching