updated entry controller and service to handle differnt data streams