WIP: Unified checks