Fixed a bug, Added some support for activity log