Less terrible object handling