Separate insert key and val build