Added storage best practices