Some refactoring how EventSpecifications are defined to facilitate file store based storage..