[#1178] Use model.State instead of core.State