Move to spring injected model helpers