Added support for non-cards style