Need to change serial UID
Need to complete javadoc
Need to complete javadoc