Remove HashMap from entities, add array of period by week