Added card layout compatibility