Bug Fix: Changing Class usage

Resolving "no such function" caused by class usage changing