Add support for non-list cards