Simplified both Persistence and Protocol packages and enhanced unit tests