Add better string support to models too