Refactor config checks into strategies
Refactor data strategies and add todos