Refractor server
Use Generics
Refractor server
Add javadoc