Modifications for Silverlight