A computer-implemented method, a computer system and a computer program for controlling electric vehicle charging infrastructure that is used by a plurality of electric vehicles, wherein the infrastructure comprises a plurality of charging points. The method comprises receiving schedule information for the electric vehicles, the schedule information including, for each of the electric vehicles, at least one vehicle power characteristic. The method further comprises determining at least one power constraint for each of the electric vehicles based on the vehicle power characteristic. The method further comprises receiving an arrival indication for a respective one of the electric vehicles. The method further comprises assigning the respective electric vehicle to charge at one of the charging points for at least one time interval according to the respective power constraint.