Made the data interface to be more generic (in the future
we should have also Google etc.),