Fix for Non-ActiveRecord class