More work
Restructed API