Update class reference and dependency