Added variable extract

Change-Id: I1555da2f12695a8d5bdb0720f8224ef99b7b7cfc