Changed namespace, Added two utilities