Updated javadoc
Update in duty and collector
Updates persistence layer