Added first version of planned API changes