Improve activity and add doc