New version with support for Credit Cards