Fixing the storage template variables