Reintroduce models + libs