Moved to class structure.