Last fixes with labels and usages of arrays instead of List<T>