Expanded class hierarchy of CallableClass