Change endpoints generation