Applying changes from Cosmopaco