Consolidate CRUD file usage