Added searching and changed relationship loading mechanism