Added dependencies/constants to class structure