Use static types rather than strings where possible