Updated to work with new Filter Module