Api changes
Merged some changes
Deleted