Fixed mixed indentations, Added user collection wrapper