Updated how entities are set, so that default values are first and custom values are last.