OK, I understand the issue you are after but I do not understand the "pain when changing the model to match the site plan".

Could you elaborate the whole workaround you are using?