Initial builder implementation