Authentication added to tomcat
Serializalisation to ComparableOptionAdapter
Merged refactor