More fixes!
- Added support 'type' , 'atr', openResponse
- More CleanUp

Change-Id: I9515ca46b272dd6604d1c711b88fe358279e340d