Added support for card storage