Add: Restructuring of the api