Changed storage to conversion types.