Made unitofwork conform to SRP