Added entities ans relationships 2.0