Split trust store attributes in two

Fixes issue #31