Small additions to support point filtering