Update Mantle dependency to latest 1.5 & fix related Model issues