Added entities ans relationships