Better handling of feature images