Added variables on component level. please review