Added comments
Issues with UUID comparison should be fixed now