Updated calculations to use new Filters class where appropriate