Using class handles rather than structures