Add core and lib parts