Updates for the core drag 'n drop construction of the model