Fixing filtering
Fixing duplicate code
re-throw exceptions
Missed package rename