change adapter class for general using and add diolage when loading from...

... server