Add hosts and filtering support