Add equals() and hashCode()
Add transfer object class
Edit factory methods classes
Edit test classes