diff --git a/app/models/learning_object/attachment.rb b/app/models/learning_object/attachment.rb
index ea56409fb23fc440979596d73ec999df7d6eadca..a40cb33563da7848a5e7e0344c42ae88da195f55 100644
--- a/app/models/learning_object/attachment.rb
+++ b/app/models/learning_object/attachment.rb
@@ -1,32 +1,4 @@
 class LearningObject::Attachment
-  attr_accessor :bitstreams
-
-  def initialize(bitstreams)
-    @bitstreams = bitstreams
-  end
-
-  def get_retrievelink
-    get_bitstream_retrievelink_of "ORIGINAL"
-  end
-
-  def get_filename
-    get_bitstream_filename_of "ORIGINAL"
-  end
-
-  private
-
-  def get_bitstream_retrievelink_of name
-    values = @bitstreams.select { |v| v["bundleName"] == name }
-    unless values.empty?
-      return "#{DspaceService.link}#{values.first["retrieveLink"]}"
-    end
-  end
-
-  def get_bitstream_filename_of name
-    values = @bitstreams.select { |v| v["bundleName"] == name }
-    unless values.empty?
-      return values.first["name"]
-    end
-  end
-
+  include ActiveModel::Model
+  attr_accessor :id, :name, :link, :retrieve_link, :description, :format, :mime_type, :size
 end