Tidied up classes and used new method in image service bean to cope with
complex datasets