FEATURE 1h - change to mongoid