Some work for multi platform support