Add 2k8 support & improved whole functionality

Change-Id: Ib6bddda06e6fff4fb5a2557af219365b10551155