* Entity changes related to #2