Modifications for windows extensions