Improving @Unupdatable code