Updated framework api