Properly wrap ODB objects