Object manager now uses endpoint objects