Address #135, update models ref due to compatibility break