Implemented new framework design to better reflect javacard