Added class for variables