Rework of API