Added some data intake logic