Adding more info for proper setup