Adding initial version of source+data