Model change, rudimental DataHandler and javadoc integration