Updated to support volume filtering