Added platform checks