Adding support for updating entities explicitly (first try)