Pulled out dependencies on Windows for add page