Added basic builder logic