Improve handling of User Activity