Method filtering + Error fixes + Benchmark