secret-nigon : claims

better integration of claims