added default object handling