(feat) Pass the entity to be modified by reference to make interfaces cleaner - #616