Replaced usage of UUID with object references