Updated CardFormatter to include more information