Update to new factorie, include onto loader