CCard package Refactored