8999de4313
* Add veneer * Fix queries * Remove redundant type * Fix todos * Sync and fix some todos * Revert unrelated changes * Revert unrelated changes[2] * Revert unrelated changes[3]