Fixing entity.rb to cover difference of schema