- Extracted out ActiveRecord handling to another method so I can extract out to another gem
- Upgraded version