Universe made patchable

Universe implementation updated to work with the current version of the patch
module