A computer-implemented method for controlling electric vehicle charging infrastructure that is used by a plurality of electric vehicles, the plurality of electric vehicles including electric vehicles of different models, the infrastructure comprising a plurality of charging points, the method comprising: receiving schedule information for the electric vehicles, the schedule information including, for each of the electric vehicles, at least one vehicle power characteristic, wherein the vehicle power characteristic includes a vehicle model; determining at least one power constraint for each of the electric vehicles based on the vehicle power characteristic, wherein the at least one power constraint includes one or more electric current constraints, wherein for each one of the electric vehicles, the electric current constraints specify at least one the following: an amount of current that can be supplied to the corresponding electric vehicle; whether varying current can be supplied to the corresponding electric vehicle; whether more than one phase of current can be supplied to the corresponding electric vehicle; which phase of current the corresponding electric vehicle is capable of charging on; receiving an arrival indication for a respective one of the electric vehicles, wherein the arrival indication includes a current state of charge for the electric vehicle; assigning (S105, S111) the respective electric vehicle to charge at one of the charging points for at least one time interval according to the respective power constraint, wherein the respective electric vehicle is assigned to charge at one of the charging points based on optimization of an objective function, wherein the objective function includes a fair share component to minimize the number of electric vehicles below a corresponding minimum state of charge, wherein the minimum state of charge reflects a charge needed for the corresponding electric vehicle to safely reach a next charging point. receiving schedule information for the electric vehicles, the schedule information including, for each of the electric vehicles, at least one vehicle power characteristic, wherein the vehicle power characteristic includes a vehicle model; determining at least one power constraint for each of the electric vehicles based on the vehicle power characteristic, wherein the at least one power constraint includes one or more electric current constraints, wherein for each one of the electric vehicles, the electric current constraints specify at least one the following: an amount of current that can be supplied to the corresponding electric vehicle; whether varying current can be supplied to the corresponding electric vehicle; whether more than one phase of current can be supplied to the corresponding electric vehicle; which phase of current the corresponding electric vehicle is capable of charging on; an amount of current that can be supplied to the corresponding electric vehicle; whether varying current can be supplied to the corresponding electric vehicle; whether more than one phase of current can be supplied to the corresponding electric vehicle; which phase of current the corresponding electric vehicle is capable of charging on; receiving an arrival indication for a respective one of the electric vehicles, wherein the arrival indication includes a current state of charge for the electric vehicle; assigning (S105, S111) the respective electric vehicle to charge at one of the charging points for at least one time interval according to the respective power constraint, wherein the respective electric vehicle is assigned to charge at one of the charging points based on optimization of an objective function, wherein the objective function includes a fair share component to minimize the number of electric vehicles below a corresponding minimum state of charge, wherein the minimum state of charge reflects a charge needed for the corresponding electric vehicle to safely reach a next charging point.