Add initial draft for active records
Remove utils; update affinity resolution