Added activity indicator support