Added storage layer