add active record mapper
Fix mapper
Add mode in test