Work in progress: Refactor validation framework