Added compatibility to all platforms