Automatic metadata generation added