Add generic storage