Added storage variables