Removed Local Class, Added Lib