DS-1234

Modified the classes to work with DSpace 3.2