Builder: Improve column add/remove APIs and add 2 by default