Organized Code, Added Metrics and Updater