added support for non-table class objects