Validation
Adding store caching etc