Disconnected the state from OS dependant properties