Add more files and lib