Added more of variables