Adds simulator support