Added storage simple implementation