Updated UML to match code
Added singleton classes to UML which will replace serialization of data to be put in an intent