Fixes and trying to add mongoid_support