More abstraction of cert store, some validation