Update usage and simplify some model fields