Changed name and refined API