Updated to support new filters and cleaned up public sockets. #95