Better object handling