Add friend and location classes