Updated structure on Windows platform