Added manifest and updated setup