Adding restructured API