Adding APIs
Fixing conflict