Fixing small bugs
Adding cascade deletion and persistence
End of agency refactoring