Added lib_src and improved data format