Improved Entity::set