Removed API
Fixed mapping