Updated model, and made check script more idiomatic