More models and a library change