Variables funtionality added